Merge commit 'upstream/0.4.5+svn3450_dfsg3'
authorAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:56:11 +0000 (12:56 +0100)
committerAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:56:11 +0000 (12:56 +0100)
commitdff8ea281d96f7742de0c23ea812e016dfd2a409
tree77e4b9fb63fdf9abb158bf9f5c65b6e8b4a8c901
parent438658356b9127ed2f180f83d680eebf8212b29a
parenta7a7b8a236e4ce9e91701bed9c5f86effabd1460
Merge commit 'upstream/0.4.5+svn3450_dfsg3'